From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 31 May 2015 01:22:38 +0000 (-0400)
Subject: accel map: Fix compiler warnings
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~6731
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7c03f62206fdcb45ac4e888b4f33e295cdf52e81;p=gtk%2B3.0.git

accel map: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
---

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index c3a196d277..d5e53d35f7 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -132,7 +132,6 @@ enum {
 static GHashTable  *accel_entry_ht = NULL;	/* accel_path -> AccelEntry */
 static GSList      *accel_filters = NULL;
 static gulong	    accel_map_signals[LAST_SIGNAL] = { 0, };
-static GtkAccelMap *accel_map;
 
 /* --- prototypes --- */
 static void do_accel_map_changed (AccelEntry *entry);
@@ -1021,10 +1020,12 @@ gtk_accel_map_class_init (GtkAccelMapClass *accel_map_class)
 }
 
 static void
-gtk_accel_map_init (GtkAccelMap *accel_map)
+gtk_accel_map_init (GtkAccelMap *map)
 {
 }
 
+static GtkAccelMap *accel_map;
+
 /**
  * gtk_accel_map_get:
  *